Remove usages of _LIBCPP_MSVC which is never defined git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302736 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/__config b/include/__config index 708f400..4ad700e 100644 --- a/include/__config +++ b/include/__config
@@ -974,7 +974,7 @@ # if defined(__GNUC__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \ (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI) # define _LIBCPP_NO_RTTI -# elif defined(_LIBCPP_MSVC) && !defined(_CPPRTTI) +# elif defined(_LIBCPP_COMPILER_MSVC) && !defined(_CPPRTTI) # define _LIBCPP_NO_RTTI # endif #endif
diff --git a/include/__undef_min_max b/include/__undef_min_max index f4ca091..71db396 100644 --- a/include/__undef_min_max +++ b/include/__undef_min_max
@@ -10,7 +10,7 @@ #ifdef min #if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS) -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("macro min is incompatible with C++. Try #define NOMINMAX " "before any Windows header. #undefing min") #else @@ -22,7 +22,7 @@ #ifdef max #if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS) -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("macro max is incompatible with C++. Try #define NOMINMAX " "before any Windows header. #undefing max") #else diff --git a/include/ext/hash_map b/include/ext/hash_map index 66f2b11..998e8f6 100644 --- a/include/ext/hash_map +++ b/include/ext/hash_map
@@ -207,7 +207,7 @@ #include <ext/__hash> #if __DEPRECATED -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map>") #else # warning Use of the header <ext/hash_map> is deprecated. Migrate to <unordered_map> diff --git a/include/ext/hash_set b/include/ext/hash_set index 916ed69..38f81ed 100644 --- a/include/ext/hash_set +++ b/include/ext/hash_set
@@ -199,7 +199,7 @@ #include <ext/__hash> #if __DEPRECATED -#if defined(_LIBCPP_MSVC) +#if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set>") #else # warning Use of the header <ext/hash_set> is deprecated. Migrate to <unordered_set> diff --git a/src/include/atomic_support.h b/src/include/atomic_support.h index 378541b..08847e6 100644 --- a/src/include/atomic_support.h +++ b/src/include/atomic_support.h
@@ -29,7 +29,7 @@ #endif #if !defined(_LIBCPP_HAS_ATOMIC_BUILTINS) && !defined(_LIBCPP_HAS_NO_THREADS) -# if defined(_LIBCPP_MSVC) +# if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("Building libc++ without __atomic builtins is unsupported") # else # warning Building libc++ without __atomic builtins is unsupported diff --git a/src/thread.cpp b/src/thread.cpp index 3f283c3..412a8fa 100644 --- a/src/thread.cpp +++ b/src/thread.cpp
@@ -99,7 +99,7 @@ #else // defined(CTL_HW) && defined(HW_NCPU) // TODO: grovel through /proc or check cpuid on x86 and similar // instructions on other architectures. -# if defined(_LIBCPP_MSVC) +# if defined(_LIBCPP_WARNING) _LIBCPP_WARNING("hardware_concurrency not yet implemented") # else # warning hardware_concurrency not yet implemented diff --git a/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp b/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp index 2b19211..aa8eb39 100644 --- a/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp +++ b/test/std/utilities/function.objects/func.not_fn/not_fn.pass.cpp
@@ -416,7 +416,7 @@ ThrowsOnCopy() = default; bool operator()() const { assert(false); -#if defined(_LIBCPP_MSVC) +#if defined(TEST_COMPILER_C1XX) __assume(0); #else __builtin_unreachable(); 